Port of web-based virtual disk manager complete.
import org.xenoserver.control.XML;
public class RootBean implements HttpSessionBindingListener {
- static String state_filename_out = "/var/lib/xen/vdstate.xml";
- static String partition_filename = "/proc/partitions";
- static int default_sector_size = 512;
-
PartitionManager pm;
VirtualDiskManager vdm;
public void valueUnbound(HttpSessionBindingEvent event) {
doFlushState();
}
-
-/*
- public int getPartitionCount() {
- return pm.getPartitionCount();
- }
-
- public Partition getPartition(int index) {
- return pm.getPartition(index);
- }
-
- public String doAddPartition(String partition, String chunksize) {
- Partition p = pm.get_partition(partition);
- String result = "done";
- int loop;
- long size;
-
- if (p == null) {
- return (" eh? what partition: " + partition);
- }
-
- size = Library.parse_size(chunksize) / default_sector_size;
- if (size == 0) {
- return ("error: invalid chunk size");
- }
- vdm.add_xeno_partition(p, size);
- pm.add_xeno_partition(p);
-
- return "done";
- }
-
- public int getVirtualDiskCount() {
- return vdm.getVirtualDiskCount();
- }
-
- public VirtualDisk getVirtualDisk(int index) {
- return vdm.getVirtualDisk(index);
- }
-
- public VirtualDisk getVirtualDiskKey(String key) {
- return vdm.get_virtual_disk_key(key);
+
+ public PartitionManager pm() {
+ return pm;
}
-
- public String doCreateVirtualDisk(String name, String size, long expiry) {
- VirtualDisk vd;
- Date date = new Date();
- long parse_size;
-
- parse_size = Library.parse_size(size) / default_sector_size;
- if (parse_size == 0) {
- return ("error: invalid size");
- }
- vd =
- vdm.create_virtual_disk(
- name,
- parse_size,
- new Date(date.getTime() + expiry));
-
- return ("Virtual Disk created with key: " + vd.get_key());
-
+
+ public VirtualDiskManager vdm() {
+ return vdm;
}
- public String doDeleteVirtualDisk(String key) {
- if (key == null || key.trim().equals("")) {
- return ("error: no virtual disk specified");
- }
- vdm.delete_virtual_disk(key);
-
- return ("okay");
- }
-
- public String doRefreshVirtualDisk(String key, long expiry) {
- VirtualDisk vd = vdm.get_virtual_disk_key(key);
- Date date;
- String s = "";
-
- if (vd == null) {
- return ("disk not found: " + key);
- }
- s = vd.get_expiry().toString();
- date = new Date(vd.get_expiry().getTime() + expiry);
- vd.set_expiry(date);
-
- return ("okay " + expiry + " " + s + " " + date.toString());
- }
-
- public int getFreeExtentCount() {
- VirtualDisk free = vdm.getFreeVirtualDisk();
- return free.getExtentCount();
- }
-
- public Extent getFreeExtent(int index) {
- VirtualDisk free = vdm.getFreeVirtualDisk();
- return free.getExtent(index);
- }
-
- public Enumeration getVirtualBlockDevices() {
- return vdm.getVirtualBlockDevices();
- }
-
- public String doCreateVirtualBlockDevice(
- String vd_key,
- int domain,
- int vbd_num,
- String mode) {
- VirtualBlockDevice vbd;
- VirtualDisk vd;
-
- vbd = vdm.create_virtual_block_device(vd_key, domain, vbd_num, mode);
- if (vbd != null) {
- String command;
- FileWriter fw;
-
- vd = vdm.get_virtual_disk_key(vd_key);
- command = vd.dump_xen(vbd);
-
- try {
- fw = new FileWriter("/proc/xeno/dom0/vhd");
- fw.write(command);
- fw.flush();
- fw.close();
- } catch (Exception e) {
- return (e.toString());
- }
- return command;
- } else {
- return "Error encountered";
- }
- }
-
- public String doFlushVirtualBlockDevices() {
- vdm.flush_virtual_block_devices();
- return "done";
- }
-*/
public void doFlushState() {
XML.saveState(pm, vdm, Settings.STATE_OUTPUT_FILE);
}
INCLUDE&vdmenu.tmpl
<td valign="top">
+<%
+ VirtualDisk free = root.vdm().getFreeDisk();
+%>
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
+<tr><td>
+Total available free space: <%= Library.formatSize(free.getSize() * Settings.SECTOR_SIZE,8,true) %>
+</td></tr>
+
+
+##WHITESPACE## ##GREYLINE1## ##WHITESPACE##
+
<tr><td>
<table cellpadding="2" cellspacing="0" border="0">
<tbody>
- <tr class="vdh"><td>idx</td><td>disk</td><td>offset</td><td>size </td></tr>
+ <tr class="vdh"><td>disk</td><td>offset</td><td>size </td></tr>
<%
- long space = 0;
- int count = root.getFreeExtentCount();
- for (int loop = 0; loop < count; loop++)
+ Iterator i = free.extents();
+ while (i.hasNext())
{
- Extent e = root.getFreeExtent(loop);
- space += e.getSize();
+ Extent e = (Extent) i.next();
%>
<tr class="vdt">
- <td ><%= loop %></td>
<td ><%= e.getDisk() %></td>
<td align="right"><%= e.getOffset() %> </td>
<td align="right"><%= e.getSize() %> </td>
</table>
</td></tr>
-
-##WHITESPACE## ##GREYLINE1## ##WHITESPACE##
-
-<tr><td>
-Total available freespace: <%= space * 512 / (1024 * 1024) %> MB
-</td></tr>
-
</tbody>
</table>
<tbody>
<tr class="vdh"><td></td><td>maj:min</td><td>blocks</td><td>start sect</td><td>num sects</td><td>name</td></tr>
<%
- int count = root.getPartitionCount();
+ int count = root.pm().getPartitionCount();
for (int loop = 0; loop < count; loop++)
{
- Partition p = root.getPartition(loop);
- if (p.getIsXeno() == true)
+ Partition p = root.pm().getPartition(loop);
+ if (p.isXeno() == true)
{
%>
<tr class="vds"><td></td>
{
%>
output[<%= i %>] =<br>
-<%= root.doAddPartition(partitions[i], size) %> <br>
+<%= new CommandPartitionAdd(partitions[i], Library.parseSize(size), false).execute() %> <br>
<%
}
}
<tbody>
<tr class="vdh"><td>maj:min</td><td>blocks</td><td>start sect</td><td>num sects</td><td>name</td></tr>
<%
- int count = root.getPartitionCount();
+ int count = root.pm().getPartitionCount();
for (int loop = 0; loop < count; loop++)
{
- Partition p = root.getPartition(loop);
- if (p.getIsXeno() == true)
+ Partition p = root.pm().getPartition(loop);
+ if (p.isXeno() == true)
{
%>
<tr class="vds">
<tr><td>
<table cellpadding="2" cellspacing="0" border="0">
<tbody>
- <tr class="vdh"><td></td><td>vd key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td></tr>
+ <tr class="vdh"><td></td><td>vd key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td><td width="5"></td><td>size</td></tr>
<%
- int count = root.getVirtualDiskCount();
- for (int loop = 0; loop < count; loop++)
+ Iterator i = root.vdm().getVirtualDisks();
+ while (i.hasNext())
{
- VirtualDisk vd = root.getVirtualDisk(loop);
+ VirtualDisk vd = (VirtualDisk) i.next();
%>
<tr class="vdt">
<td>
- <input type="radio" name="vd"
- <% if (loop == 0) { %> checked <% } %>
- value="<%= vd.getKey() %>">
+ <input type="radio" name="vd" value="<%= vd.getKey() %>">
</td>
<td><%= vd.getKey() %></td>
<td></td>
<td><%= vd.getName() %></td>
<td></td>
<td><%= vd.getExpiry() %></td>
+ <td></td>
+ <td><%= Library.formatSize(vd.getSize()*Settings.SECTOR_SIZE,8,false) %></td>
</tr>
<%
}
{
domain = Integer.decode(hsrw.getParameter("domain")).intValue();
vbd = Integer.decode(hsrw.getParameter("vbd")).intValue();
+ Mode mode;
+ if (hsrw.getParameter("mode").equals("rw")) {
+ mode = Mode.READ_WRITE;
+ } else {
+ mode = Mode.READ_ONLY;
+ }
+
%>
output =<br>
-<%= root.doCreateVirtualBlockDevice(hsrw.getParameter("vd"),
+<%= new CommandVbdCreate(hsrw.getParameter("vd"),
domain, vbd,
- hsrw.getParameter("mode")) %>
+ mode).execute() %>
<%
}
catch (NumberFormatException e)
<tr class="vdh"><td>vd key</td><td>dom</td><td>vbd</td><td>mode</td></tr>
<%
- for (Enumeration e = root.getVirtualBlockDevices(); e.hasMoreElements();)
+ for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();)
{
- VirtualBlockDevice vbd = (VirtualBlockDevice) e.nextElement();
+ VirtualBlockDevice vbd = (VirtualBlockDevice) i.next();
+ VirtualDisk vd = vbd.getVirtualDisk();
%>
<tr class="vdt">
- <td><%= vbd.getKey() %></td>
+ <td><%= vd.getKey() %></td>
<td><%= vbd.getDomain() %></td>
- <td><%= vbd.getVBDNum() %></td>
+ <td><%= vbd.getVbdNum() %></td>
<td><%= vbd.getMode().toString() %></td>
</tr>
<%
<%
HttpServletRequestWrapper hsrw = new HttpServletRequestWrapper(request);
%>
-output = <%= root.doFlushVirtualBlockDevices() %>
+output = <%= new CommandVbdFlush().execute() %>
<%
root.doFlushState();
%>
<%
- for (Enumeration e = root.getVirtualBlockDevices(); e.hasMoreElements();)
+ for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();)
{
- VirtualBlockDevice vbd = (VirtualBlockDevice) e.nextElement();
- VirtualDisk vd = root.getVirtualDiskKey(vbd.getKey());
+ VirtualBlockDevice vbd = (VirtualBlockDevice) i.next();
+ VirtualDisk vd = vbd.getVirtualDisk();
%>
<tr class="vdt">
<td><%= vbd.getDomain() %></td>
- <td><%= vbd.getVBDNum() %></td>
+ <td><%= vbd.getVbdNum() %></td>
<td><%= vbd.getMode().toString() %></td>
- <td><%= vbd.getKey() %></td>
+ <td><%= vd.getKey() %></td>
<td><%= vd.getName() %></td>
</tr>
<%
{
expiry *= 24 * 60 * 60 * 1000 * 365;
}
+
+ expiry += System.currentTimeMillis();
%>
output =<br>
-<%= root.doCreateVirtualDisk( hsrw.getParameter("name"), size, expiry) %>
+<%= new CommandVdCreate( hsrw.getParameter("name"), Library.parseSize(size), new Date(expiry)).execute() %>
<br>
<%
}
<tr><td>
<table cellpadding="2" cellspacing="0" border="0">
<tbody>
- <tr class="vdh"><td></td><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td></tr>
+ <tr class="vdh"><td></td><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td><td width="5"></td><td>size</td></tr>
<%
- int count = root.getVirtualDiskCount();
- for (int loop = 0; loop < count; loop++)
+ Iterator i = root.vdm().getVirtualDisks();
+ while (i.hasNext())
{
- VirtualDisk vd = root.getVirtualDisk(loop);
+ VirtualDisk vd = (VirtualDisk) i.next();
%>
<tr class="vdt">
<td><input type="checkbox" name="vd" value="<%= vd.getKey() %>"></td>
<td><%= vd.getName() %></td>
<td></td>
<td><%= vd.getExpiry() %></td>
+ <td></td>
+ <td><%= Library.formatSize(vd.getSize()*Settings.SECTOR_SIZE,8,false) %></td>
</tr>
<%
}
vd= <%= hsrw.getParameter("vd") %>
-vd= <%= root.doDeleteVirtualDisk(hsrw.getParameter("vd")) %>
+vd= <%= new CommandVdDelete(hsrw.getParameter("vd")).execute() %>
<%
root.doFlushState();
<tr><td>
<table cellpadding="2" cellspacing="0" border="0">
<tbody>
- <tr class="vdh"><td></td><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td></tr>
+ <tr class="vdh"><td></td><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td><td width="5"></td><td>size</td></tr>
<%
- int count = root.getVirtualDiskCount();
- for (int loop = 0; loop < count; loop++)
+ Iterator i = root.vdm().getVirtualDisks();
+ while (i.hasNext())
{
- VirtualDisk vd = root.getVirtualDisk(loop);
+ VirtualDisk vd = (VirtualDisk) i.next();
%>
<tr class="vdt">
<td><input type="checkbox" name="vd" value="<%= vd.getKey() %>"></td>
<td><%= vd.getName() %></td>
<td></td>
<td><%= vd.getExpiry() %></td>
+ <td></td>
+ <td><%= Library.formatSize(vd.getSize()*Settings.SECTOR_SIZE,8,false) %></td>
</tr>
<%
}
expiry *= 24 * 60 * 60 * 1000 * 365;
}
+ expiry += System.currentTimeMillis();
+
for (int i = 0; i < vds.length; i++)
{
%>
-vd = <%= root.doRefreshVirtualDisk(vds[i], expiry) %> <br>
+vd = <%= new CommandVdRefresh(vds[i], new Date(expiry)).execute() %> <br>
<%
}
}
<table cellpadding="2" cellspacing="0" border="0">
<tbody>
- <tr class="vdh"><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td></tr>
+ <tr class="vdh"><td>key</td><td width="5"></td><td>name</td><td width="5"></td><td>expiry</td><td width="5"></td><td>size</td></tr>
<%
- int count = root.getVirtualDiskCount();
- for (int loop = 0; loop < count; loop++)
+ Iterator i = root.vdm().getVirtualDisks();
+ while (i.hasNext())
{
- VirtualDisk vd = root.getVirtualDisk(loop);
+ VirtualDisk vd = (VirtualDisk) i.next();
%>
<tr class="vdt">
<td><%= vd.getKey() %></td>
<td><%= vd.getName() %></td>
<td></td>
<td><%= vd.getExpiry() %></td>
+ <td></td>
+ <td><%= Library.formatSize(vd.getSize()*Settings.SECTOR_SIZE,8,false) %></td>
</tr>
<%
}
<%@ page import="org.xenoserver.web.*" %>
<%@ page import="org.xenoserver.control.*" %>
<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.Date" %>
<%@ page import="javax.servlet.http.HttpServletRequestWrapper" %>
<html lang="en">
projects / xen.git / commitdiff